From c5004d34693341e2b368467fad1860e53cb5a5d8 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Fri, 2 May 2014 10:50:04 +0200 Subject: [PATCH] x86/EPT: refine direct MMIO checking when determining EMT With need_iommu() only ever true when iommu_enabled is also true, and with the former getting set when a PCI device gets added to a guest, the checks can be consolidated. The range set check are left in place just in case raw MMIO or I/O port ranges get passed to a guest. At once drop open-coding of cache_flush_permitted(). Signed-off-by: Jan Beulich Acked-by: Kevin Tian Reviewed-by: Tim Deegan --- xen/arch/x86/hvm/mtrr.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/hvm/mtrr.c b/xen/arch/x86/hvm/mtrr.c index 894de5f54c..34215f4467 100644 --- a/xen/arch/x86/hvm/mtrr.c +++ b/xen/arch/x86/hvm/mtrr.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -810,10 +811,7 @@ int epte_get_entry_emt(struct domain *d, unsigned long gfn, mfn_t mfn, return -1; } - if ( !iommu_enabled || - (rangeset_is_empty(d->iomem_caps) && - rangeset_is_empty(d->arch.ioport_caps) && - !has_arch_pdevs(d)) ) + if ( !need_iommu(d) && !cache_flush_permitted(d) ) { ASSERT(!direct_mmio || !((mfn_x(mfn) ^ d->arch.hvm_domain.vmx.apic_access_mfn) >> -- 2.30.2